(while-no-input): Don't splice BODY directly into the `or' form.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df60dfec6f46d8508dcd7ef460195ae2e14056cc..73cb70ceba0e91419d3f3889ff1fd0c5630cc45d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-08  Johan Bockg\e$(Q)[\e(Brd  <bojohan@gnu.org>
+
+       * subr.el (while-no-input): Don't splice BODY directly into the
+       `or' form.
+
 2008-03-06  Kim F. Storm  <storm@cua.dk>
 
        * help.el (view-emacs-todo): Rename from view-todo.  Change users.

diff --git a/lisp/subr.el b/lisp/subr.el
index 329c4ca2c24ae551bbc721821545872cd0924f40..2f9cdd769e0d74d9341ad9a968c318a616e99507 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2478,7 +2478,7 @@ If BODY finishes, `while-no-input' returns whatever value BODY produced."
        (catch ',catch-sym
         (let ((throw-on-input ',catch-sym))
           (or (input-pending-p)
-              ,@body))))))
+              (progn ,@body)))))))
 
 (defmacro combine-after-change-calls (&rest body)
   "Execute BODY, but don't call the after-change functions till the end.